Revision: bazaar--devo--1.2--patch-7
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Mon Jan 31 08:15:15 GMT 2005
Standard-date: 2005-01-31 08:15:15 GMT
New-files: libarch/conflict-handling.c
    libarch/conflict-handling.h
    tests/.arch-ids/test-conflicts.sh.id
    tests/test-conflicts.sh
Modified-files: commands/apply-changeset.c
    commands/apply-delta.c commands/commit.c commands/redo.c
    commands/replay.c commands/resolved.c commands/status.c
    commands/switch.c commands/undo.c commands/update.c
    libarch/apply-changeset.c libarch/apply-changeset.h
    libarch/build-revision.c libarch/commit.c
    libarch/library-txn.c libarch/merge-three-way.c
    libarch/merge.c libarch/proj-tree-lint.c
    libarch/proj-tree-lint.h libarch/replay.c
    tests/Makefile.in
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--base-0
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-1
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-2
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-3
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-4
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-5
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-6
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-7
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-8
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-9
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-10
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-11
    thelove@canonical.com/bazaar--devo--1.2--patch-7
Summary: Files based resolved (if you get conflicts this is where)
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--resolve--1.2--base-0
   tag of thelove@canonical.com/bazaar--devo--1.2--patch-3

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-1
   Fixed typo. arch_conflicts_occurred, not arch_conflicts_occured. Did I really do this?

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-2
   Baz conflict code now records what conflicted

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-3
   Now I list the files that are conflicted

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-4
   Baz resolved now works. Just a few outstanding things remain

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-5
   All that's needed is the tests fixed

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-6
   Fixing merge test I broke

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-7
   Added one more pre-merge test for baz merge

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-8
   Fixing up the reject code for final form

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-9
   Star merged thelove to resolve conflicts

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-10
   Changing a test case so that it runs with pqm like on the local machine

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-11
   ANOTHER test case fix. :)

